auto upstream
authorJoakim Verona <joakim@verona.se>
Tue, 25 Dec 2012 22:31:27 +0000 (23:31 +0100)
committerJoakim Verona <joakim@verona.se>
Tue, 25 Dec 2012 22:31:27 +0000 (23:31 +0100)

Trivial merge